Only activate if the action is sensitive. (#127187, Christian Persch)

Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkaction.c (gtk_action_activate): Only activate if
	the action is sensitive.  (#127187, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index e933565a53c357017aeca6242589f0688a9947a2..e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_activate): Only activate if 
+       the action is sensitive.  (#127187, Christian Persch)
+
 Mon Nov 17 23:23:49 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c: Add mouse wheel support.  (#126517)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e933565a53c357017aeca6242589f0688a9947a2..e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_activate): Only activate if 
+       the action is sensitive.  (#127187, Christian Persch)
+
 Mon Nov 17 23:23:49 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c: Add mouse wheel support.  (#126517)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e933565a53c357017aeca6242589f0688a9947a2..e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_activate): Only activate if 
+       the action is sensitive.  (#127187, Christian Persch)
+
 Mon Nov 17 23:23:49 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c: Add mouse wheel support.  (#126517)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e933565a53c357017aeca6242589f0688a9947a2..e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_activate): Only activate if 
+       the action is sensitive.  (#127187, Christian Persch)
+
 Mon Nov 17 23:23:49 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c: Add mouse wheel support.  (#126517)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e933565a53c357017aeca6242589f0688a9947a2..e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_activate): Only activate if 
+       the action is sensitive.  (#127187, Christian Persch)
+
 Mon Nov 17 23:23:49 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c: Add mouse wheel support.  (#126517)

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 28694bab2f9d6319bbba8c6ef9660217daa2ffa5..7193312bf6eeaef53230bfb120fa632ee05139fd 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -875,8 +875,9 @@ disconnect_proxy (GtkAction *action,
  * gtk_action_activate:
  * @action: the action object
  *
- * Emits the "activate" signal on the specified action. 
- * This gets called by the proxy widgets when they get activated.
+ * Emits the "activate" signal on the specified action, if it isn't 
+ * insensitive. This gets called by the proxy widgets when they get 
+ * activated.
  *
  * It can also be used to manually activate an action.
  *
@@ -885,7 +886,10 @@ disconnect_proxy (GtkAction *action,
 void
 gtk_action_activate (GtkAction *action)
 {
-  g_signal_emit (action, action_signals[ACTIVATE], 0);
+  g_return_if_fail (GTK_IS_ACTION (action));
+  
+  if (action->private_data->sensitive)
+    g_signal_emit (action, action_signals[ACTIVATE], 0);
 }
 
 /**